b9378ae5ad6e1b92d4954ec3228853e1a9b08e40,engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDaoImpl.java,ImageStoreDaoImpl,findImageCacheByScope,#ZoneScope#,95

Before Change


    public List<ImageStoreVO> findImageCacheByScope(ZoneScope scope) {
        SearchCriteria<ImageStoreVO> sc = createSearchCriteria();
        sc.addAnd("role", SearchCriteria.Op.EQ, DataStoreRole.ImageCache);
        sc.addAnd("scope", SearchCriteria.Op.EQ, ScopeType.ZONE);
        sc.addAnd("dcId", SearchCriteria.Op.EQ, scope.getScopeId());
        return listBy(sc);
    }

After Change


    public List<ImageStoreVO> findImageCacheByScope(ZoneScope scope) {
        SearchCriteria<ImageStoreVO> sc = createSearchCriteria();
        sc.addAnd("role", SearchCriteria.Op.EQ, DataStoreRole.ImageCache);
        if (scope.getScopeId() != null) {
            sc.addAnd("scope", SearchCriteria.Op.EQ, ScopeType.ZONE);
            sc.addAnd("dcId", SearchCriteria.Op.EQ, scope.getScopeId());
        }
        return listBy(sc);